diff --git a/test/boot/bootflow.c b/test/boot/bootflow.c
index b2f7797..39c2c33 100644
--- a/test/boot/bootflow.c
+++ b/test/boot/bootflow.c
@@ -12,7 +12,6 @@
 #include <bootstd.h>
 #include <dm.h>
 #include <asm/test.h>
-#include <dm/device-internal.h>
 #include <dm/lists.h>
 #include <test/suites.h>
 #include <test/ut.h>
@@ -337,7 +336,7 @@
 	ut_assert_skip_to_line(
 		"  0  efi_mgr      ready   (none)       0  <NULL>                    <NULL>");
 	ut_assert_skip_to_line("No more bootdevs");
-	ut_assert_skip_to_line("(6 bootflows, 6 valid)");
+	ut_assert_skip_to_line("(5 bootflows, 5 valid)");
 	ut_assert_console_end();
 
 	return 0;
@@ -358,10 +357,6 @@
 	ut_assertok(device_bind_driver(bootstd, "bootmeth_sandbox", "sandbox",
 				       &dev));
 
-	/* Add the system bootdev that it uses */
-	ut_assertok(device_bind_driver(bootstd, "system_bootdev",
-				       "system-bootdev", &dev));
-
 	ut_assertok(bootstd_test_drop_bootdev_order(uts));
 
 	bootstd_clear_glob();